c0069685087fb37513804739b74e715f4fb666bf,source/jetbrains/mps/vcs/ui/MergeResultView.java,MergeResultView,collectSetConflicts,#Class#,196

Before Change


        changes.put(spc.getAffectedNodeId(), new HashSet<C>());
      }

      changes.get(spc.getAffectedNodeId()).add(spc);
    }

    for (String id : changes.keySet()) {

After Change


        changes.put(new Pair<String, String>(spc.getAffectedNodeId(), spc.getRole()), new HashSet<SetReferenceChange>());
      }

      changes.get(new Pair<String, String>(spc.getAffectedNodeId(), spc.getRole())).add(spc);
    }

    for (Pair p : changes.keySet()) {